Resolve conflict over use of name xen_elfnote.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c
index 31c1532b69fee5d278b801bcf62893b0433a0c91..5a23667667b8f665138e9919017bc30aa81a1f7c 100644 (file)
--- a/tools/libxc/xc_core.c
+++ b/tools/libxc/xc_core.c
@@ -328,7 +328,7 @@ xc_domain_dumpcore_via_callback(int xc_handle,
     Elf_Shdr *shdr;
 
     /* elf notes */
-    struct xen_elfnote elfnote;
+    struct elfnote elfnote;
     struct xen_dumpcore_elfnote_none_desc none;
     struct xen_dumpcore_elfnote_header_desc header;
     struct xen_dumpcore_elfnote_xen_version_desc xen_version;

diff --git a/tools/libxc/xc_core.h b/tools/libxc/xc_core.h
index 2a65bc250144e6e5ded67db174fb6e71218681d0..cf5b15d12b79f67758e34ff6bea7d17ab502c617 100644 (file)
--- a/tools/libxc/xc_core.h
+++ b/tools/libxc/xc_core.h
@@ -39,7 +39,7 @@
 #define XEN_DUMPCORE_ELFNOTE_NAME               "Xen"
 /* note numbers are defined in xen/elfnote.h */
 
-struct xen_elfnote {
+struct elfnote {
     uint32_t    namesz; /* Elf_Note note; */
     uint32_t    descsz;
     uint32_t    type;
@@ -88,22 +88,22 @@ struct xen_dumpcore_elfnote_format_version_desc {
 
 
 struct xen_dumpcore_elfnote_none {
-    struct xen_elfnote                          elfnote;
+    struct elfnote                              elfnote;
     struct xen_dumpcore_elfnote_none_desc       none;
 };
 
 struct xen_dumpcore_elfnote_header {
-    struct xen_elfnote                          elfnote;
+    struct elfnote                              elfnote;
     struct xen_dumpcore_elfnote_header_desc     header;
 };
 
 struct xen_dumpcore_elfnote_xen_version {
-    struct xen_elfnote                                  elfnote;
+    struct elfnote                                     elfnote;
     struct xen_dumpcore_elfnote_xen_version_desc        xen_version;
 };
 
 struct xen_dumpcore_elfnote_format_version {
-    struct xen_elfnote                                  elfnote;
+    struct elfnote                                      elfnote;
     struct xen_dumpcore_elfnote_format_version_desc     format_version;
 };
 

diff --git a/tools/libxc/xc_ptrace_core.c b/tools/libxc/xc_ptrace_core.c
index 4ce006b550b0d67ac32b9c7b85cc56323eb8c9fe..419b3e55af3d3d32ab9b067cc7613092a2878c0f 100644 (file)
--- a/tools/libxc/xc_ptrace_core.c
+++ b/tools/libxc/xc_ptrace_core.c
@@ -280,7 +280,7 @@ elf_core_search_note(struct elf_core* ecore, const char* name, uint32_t type,
 
     n = ecore->note_sec;
     while (n < note_sec_end) {
-        const struct xen_elfnote *elfnote = (const struct xen_elfnote*)n;
+        const struct elfnote *elfnote = (const struct elfnote *)n;
         if (elfnote->namesz == strlen(name) + 1 &&
             strncmp(elfnote->name, name, elfnote->namesz) == 0 &&
             elfnote->type == type) {

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 3954e033a17dac397358a7a41a7bebedccdf8ec1..841f181f9933f427d68a371e79b6b5a113eea7e7 100644 (file)
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -28,7 +28,6 @@
 #include <asm/paging.h>
 
 #include <public/version.h>
-#include <public/elfnote.h>
 #include <public/libelf.h>
 
 extern unsigned long initial_images_nrpages(void);

diff --git a/xen/include/public/libelf.h b/xen/include/public/libelf.h
index 59b846510834774ccc117936aa2be1a983a608c0..4a580e00eb22ce51fc8176d64b3ce0af4052bff6 100644 (file)
--- a/xen/include/public/libelf.h
+++ b/xen/include/public/libelf.h
@@ -10,6 +10,7 @@
 #endif
 
 #undef ELFSIZE
+#include "elfnote.h"
 #include "elfstructs.h"
 #include "features.h"